removed sputious va_end(args) that for some reason didn't produce a

Fri May 15 22:31:49 1998  Tim Janik  <timj@gtk.org>

        * gscanner.c (g_scanner_unexp_token): removed sputious va_end(args) that
        for some reason didn't produce a compiler wrning on my machine (is
        va_end undefined for i386?).

diff --git a/glib/ChangeLog b/glib/ChangeLog
index 0a68a72161ae4bcbd5a3cd5ce1b7db79eebe0881..d7a276ba833f3e95cdcb3a37b29f85ec7411076b 100644 (file)
--- a/glib/ChangeLog
+++ b/glib/ChangeLog
@@ -1,3 +1,9 @@
+Fri May 15 22:31:49 1998  Tim Janik  <timj@gtk.org>
+
+       * gscanner.c (g_scanner_unexp_token): removed sputious va_end(args) that
+       for some reason didn't produce a compiler wrning on my machine (is
+       va_end undefined for i386?).
+
 Fri May 15 12:32:08 1998  rodo  <doulik@karlin.mff.cuni.cz>
 
        * gscanner.c: replaced some snprintf with g_snprintf

diff --git a/glib/glib.h b/glib/glib.h
index 653affcbfa4e4bbb5a63d9f9397e76827c2c9404..9ee044f7454731038cf0fe24c3211a858b70b278 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -715,7 +715,7 @@ gdouble g_timer_elapsed (GTimer      *timer,
 
 /* Output
  */
-void g_error   (const gchar *format, ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN;
+void g_error   (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
 void g_warning (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
 void g_message (const gchar *format, ...) G_GNUC_PRINTF (1, 2);
 void g_print   (const gchar *format, ...) G_GNUC_PRINTF (1, 2);

diff --git a/glib/gscanner.c b/glib/gscanner.c
index a3af99b9f4f83e930d5cda4f2ac599a9c3bea473..665af00af9b9e10ff38abce555d9a78236a8284f 100644 (file)
--- a/glib/gscanner.c
+++ b/glib/gscanner.c
@@ -886,8 +886,6 @@ g_scanner_unexp_token (GScanner             *scanner,
                     message);
     }
   
-  va_end (args);
-  
   g_free (token_string);
   g_free (expected_string);
 }